Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(ui-ux): add explore dtokens to explore dex page (ON HOLD) #567

Draft
wants to merge 61 commits into
base: main
Choose a base branch
from

Conversation

veralygit
Copy link
Contributor

@veralygit veralygit commented Apr 3, 2023

What this PR does / why we need it:

This PR adds explore dTokens to explore dex page.

Additionally this PR also adds Secondary button component to Button.tsx

Additional comments?:

  • On hold until design is finalized

veralygit and others added 30 commits February 15, 2023 18:21
* chore: update tailwindconfigs for 2.0

* add ui styles to globals
* feat(ui-ux): add Buttons 2.0 component

* add href to GradientButton

* update button styles

* update border padding for gradient button

* fix gradient button style

* update buttons to follow DSM and add LinkButton

* fix link button stylings

* fix link disabled style

* remove is cta button

* update link buttons to be more customisable

* fix link button default style

* update button stylings for gradient button and minwidth for cta button

* update naming of gradient button hover style

* update naming for gradient border hover style
* hero banner

* made GIF element into reusable component

* some styling changes for responsiveness

* removed unnecessry style tag

* removed unnecessary span

* added Montserrat font

* pr comments

* changed gif to mp4 for performance

* minor styling changes

* removed duplicate montserrat font in tailwind config

* setting responsive screen sizes

* design according to responsive design

* made header black for testing

* minor styling changes

* add max width for super large screens
* feat(ui-ux): add navbar for 2.0

* fix stylings

* fix mobile and tablet scroll

* add hover state for navlink items

* add transition for hover

* fix cards and svg images

* update font size and text color for header

* fix padding and styling issues

* fix padding for tablet and mobile view

* fix layout clip issue in header

* add cursor pointer

* fix console warnings

* fix paddings

* update paddings for header dropdown for tablet and mobile

* update links to add arrow icon and fix gradient colors

* fix transition and add translations prep

* fix header cards transitions

* cleanup

* fix gap padding for mobile view

* fix console warnings

* remove unused styles

* remove unused svg

* fix icons

* fix padding and add transition to mobile and tablet

* fix width of horizontal line for tablet and mobile view

* update to use grid view instead of flex for explore and add onclick to close desktop dropdown

* update transition for tablet and mobile view

* fix variable naming

* add transition dropdown for tablet and mobile view

* fix tailwindcss stylings

* fix tailwind stylings for mobile

* revert animation on open and closing of tablet and nav menu

* use abitrary for transition in card

* fix transition duration of headernavlink

* use headlessui transition for dropdown

* fix padding of dropdown

* standardise explore page with build page

* update to use abitrary grid for mobile view for build tab

* fix desktop grid rows to 2 for build tab

* add target to headernavlink and update stylings

* remove unused style

* fix layout issue for ecosystem

* remove mx-auto

* update build to 2 rows for tablet

* fix community layout

* update to transition opacity

* update transition

* update layout for desktop view and add backdrop blur

---------

Co-authored-by: Keng Ye <[email protected]>
* feat(ui-ux): footer design refresh

* feat(ui-ux): footer design refresh

* feat(ui-ux): footer design refresh

* feat: add socials row

* add comment

* feat: add hover styling for social icons

* fix(ui-ux): footer styling

* fix(ui-ux): socials styling

* feat(ui-ux): add footer asset and dropdown styling

* fix(ui-ux): footer top padding

* fix(ui-ux): styling for tablet

* fix(ui-ux): styling for footer padding in larger screens

* fix styling

* cleanup

* styling

* fix

* fix(ui-ux): dropdown ui styling

* fix: dropdown ui styilng

* fix

* fix github icon linking

* chore: turn off default export

* fix(ui-ux): footer for different views

* fix btm padding

* fix btm padding

* fix btm arrow

* fix section padding

* fix: inline text and dropdown

* cleanup

* fix
* feat(ui-ux): add statistics display

* update tablet and mobile view

* fix stylings and update header GradientButton padding

* fix first load call

* fix hover on start exploring button

* add bg to statistics display bar

* update globals to include smooth scroll for html

* fix scroll margin

* updated useUnitSuffix to account for N/A and fix stylings

* hide start exploring button in mobile view

* update stylings

* fix image sizes and update namings on variables

* fix flex issue for fixed width

* update margin for mobile view

* updated to remove undefine checks and string concantenation checks

* update the statsDiplay useEffect to include dependency array
…(WIP) (#510)

* feat(ui-ux): add ready for flexibility section for home page refresh

* remove ununsed png

* account for translations

* fix stylings

* add bottom margin for container

* fix button font size

* remove jellyfish

* remove v1 components from homepage

* revert pnpm-lock file

* revert pnpm-lock file

* revert eslintrc
* fix when in desktop mode set menu to false to enable scroll when responsive sizing

* update checks to add menu
* feat(ui-ux): add common component SectionTitle

* update tailwind.config.js to use monospace for Space Mono font

---------

Co-authored-by: Keng Ye <[email protected]>
…ner (#515)

* feat(ui-ux): add to show static image when video is not yet loaded

* add playsinline to enable mobile video load

* reduce file size of image

* add poster instead of adding another img tag

* remove extra space

---------

Co-authored-by: Keng Ye <[email protected]>
* feat(ui-ux): add cursor tracking for header

* update radial gradient size and create useWindowDetect hooks

* update to useDeviceDetect hook

* remove empty spaces

* add return cleanup

* update variable namings

---------

Co-authored-by: Keng Ye <[email protected]>
* fix(ui-ux): fix hover color on the header for desktop view

* update on mouse cursor on dropdown desktop header text color

* update active state and color for header text
* fix(ui-ux): styling

* chore: update e2e

* update testid for e2e

* fix: refactor and fix github external link

* fix(ui-ux): sm padding top

---------

Co-authored-by: Keng Ye <[email protected]>
* chore: add translations for header

* remove extra ,

* revert stats display changes

* feat(ui-ux): styling of header and add ru/pt telegram

* fix stylings for header upon translations change

* update zh translations

* fix grids for explore header

* update explore grids to fit height

---------

Co-authored-by: Keng Ye <[email protected]>
…#522)

* feat(ui-ux): add jellyfish animation for ready for flexibility

* remove empty spaces

* update stylings of jellyfish animation and set width to % for texts

* revert sin path and reduce travel distance

* fix tracking for desktop

* reduce jellyfish translation

---------

Co-authored-by: Keng Ye <[email protected]>
)

* feat(ui-ux): handle N/A display for Statistics Display in homepage

* update conditions for showing desc

* refactor: optional desc string

---------

Co-authored-by: Keng Ye <[email protected]>
* added blockchain features section

* adding blockchain features section

* printed Icons

* fixed variety icon issue

* rearranged for all views

* working on hover animations

* changed clsx to classnames

* refractored

* added bg accent

* clean up comments

* added animations for first 3 icons

* added animations for icons

* max width for blockchain features section

* pr comment

* removed comment

* pr comments

* used SectionTitle instead

* added key for lists

* fixed padding and width issues

* adding mouseout animations

* pr comments

* security icon mouseout animation

* added animations for immutability

* removed gradient text css

* added transition for hover text color

* fixed width of icons

* made animations ease in and out instead of linear

---------

Co-authored-by: veralygit <[email protected]>
* added translations for footer

* added missing translations for FR

* translations

* translations for footer headers

* refactored naming

* added missing translations

* Update public/locales/fr/layout.json

Co-authored-by: veralygit <[email protected]>

* Update public/locales/en-US/layout.json

Co-authored-by: veralygit <[email protected]>

* Update public/locales/de/layout.json

Co-authored-by: veralygit <[email protected]>

* Update public/locales/de/layout.json

Co-authored-by: veralygit <[email protected]>

---------

Co-authored-by: Keng Ye <[email protected]>
Co-authored-by: veralygit <[email protected]>
* feat(ui-ux): add explore card

* rename components folder

* fix diamond coin for cards

* split cards and add translations

* update card titles

* update to metal coin

* update stylings for mobile view and update variable namings

---------

Co-authored-by: Keng Ye <[email protected]>
* added translations for home page

* refactored naming

* missed out one change

* added missing translation

* Update public/locales/zh-Hant/page-index.json

Co-authored-by: veralygit <[email protected]>

* Update public/locales/zh-Hant/page-index.json

Co-authored-by: veralygit <[email protected]>

* Update public/locales/zh-Hans/page-index.json

Co-authored-by: veralygit <[email protected]>

* Update public/locales/fr/page-index.json

Co-authored-by: veralygit <[email protected]>

* Update public/locales/de/page-index.json

Co-authored-by: veralygit <[email protected]>

* Update public/locales/zh-Hans/page-index.json

Co-authored-by: veralygit <[email protected]>

* Update public/locales/zh-Hant/page-index.json

Co-authored-by: veralygit <[email protected]>

---------

Co-authored-by: Keng Ye <[email protected]>
Co-authored-by: veralygit <[email protected]>
* feature(ui-ux): blockchain ecosystem section

* fix: styling for container section

* fix styling for wider screens

* fix: refactor component

* feat: scrollable container

* fix(ui-ux): scrollable behavior

* fix(ui-ux): styling for smaller screen sizes

* fix(ui-ux): bg section

* cleanup

* fix: component refactor

* fix(ui-ux): animate first 2 cards

* fix arrow styling

* comment out animate icons on hover

* cleanup

* update page-index.json

* code cleanup

* revert needed files

* fix(ui-ux): handle card styling

* fix(ui-ux): styling for quantum card

* fix(ui-ux): padding for section

* code cleanup

* cleanup

* Revert "cleanup"

This reverts commit fa2a378.

* fix(ui-ux): section spacing

* fix

---------

Co-authored-by: nattadex <[email protected]>
Co-authored-by: Keng Ye <[email protected]>
* feat(ui-ux): add hero banner

* refactor StartExploring button

* add translations prepartions

* update hero banner and translations for wallets and masternodes page

* split translations file

* update mapping for hero banner background

* update translation

* update checks for hero banner CTA button and startExploring button

* update png to lower res

* rename variables

* update function desc

* update namings of variables

* Update src/pages/index.page.tsx

* Update src/components/commons/StartExploringButton.tsx

---------

Co-authored-by: Keng Ye <[email protected]>
@veralygit veralygit changed the title feat(ui-ux): add explore dtokens to explore dex page (WIP) feat(ui-ux): add explore dtokens to explore dex page Apr 4, 2023
@veralygit veralygit marked this pull request as ready for review April 4, 2023 02:38
@chloezxyy
Copy link
Member

chloezxyy commented Apr 4, 2023

  1. Are we following the layout for 768px as per figma?
    image

  2. Arrow in the button looks too bolded
    image

  3. Might need to add more padding for the prev section or onto your own component instead to standardize the container padding in 320px
    image

  4. Minor issue with this but the ETF button is overflowing onto the space in 320px but i think it will look obvious when the background is merged :D
    image

  5. 320px too much padding between the button
    image

>
) {
// eslint-disable-next-line no-param-reassign
allUncleanTokens.dexPrices.USDT = {
Copy link
Member

@chloezxyy chloezxyy Apr 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Curious to know why we need this hardcoded object~

Copy link
Contributor Author

@veralygit veralygit Apr 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cause we are using USDT prices.

If we call from ocean, due to the denomination being USDT the dexprices wouldnt include USDT
https://ocean.defichain.com/v0/mainnet/poolpairs/dexprices?denomination=USDT

veralygit and others added 4 commits April 4, 2023 12:16
* fix(ui-ux): background refresh

* fix: Container first trial

* fix(ui-ux): defichain ecosection arrow

* fix: Container fluid breakpoints

* fix: resize arrow

* fix: footer ui padding

* fix: Container fluidity ui

* fix(ui-ux): tag loose assets to respective sections

* fix: dfi vector logo placement

* fix: handle vector logo on smaller screens

* fix: dfi vector logo

* fix(ui-ux): generic background for all pages except homepage

* fix: handle z-index of /explore pages

* fix(ui-ux): remove unused generic background png

* fix footer arrow asset position

* fix: homepage background sizes

* code refactor for z-index

* code cleanup

* fix: z-index of glass cube

---------

Co-authored-by: veralygit <[email protected]>
Co-authored-by: Keng Ye <[email protected]>
/>
<ExploreDTokensGrid selectionTokens={selectedTabTokens} />

<SecondaryButton
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should navigate to defiscan tokens page on click

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated !

Copy link
Contributor

@kyleleow kyleleow Apr 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

click area bigger than my house 🌚
image

@kyleleow kyleleow changed the title feat(ui-ux): add explore dtokens to explore dex page feat(ui-ux): add explore dtokens to explore dex page (ON HOLD) Apr 4, 2023
@veralygit veralygit marked this pull request as draft April 4, 2023 10:02
Base automatically changed from feature/2.0 to main April 17, 2023 07:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants